Auto merge of #4246 - est31:master, r=Mark-Simulacrum
authorbors <bors@rust-lang.org>
Sun, 2 Jul 2017 13:44:07 +0000 (13:44 +0000)
committerbors <bors@rust-lang.org>
Sun, 2 Jul 2017 13:44:07 +0000 (13:44 +0000)
Let two further tests tolerate col info in panics

Needed by https://github.com/rust-lang/rust/pull/42938

I've now ripgrepped for "panicked at" and found no further
test that hardcodes the "filename:line$" format.


Trivial merge